Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 19 Aug 2011 05:43:02 +0000 (22:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 19 Aug 2011 05:43:02 +0000 (22:43 -0700)
commit0944f73dff69414c3678b501dd12eea2d071359d
tree103950edcdb835bd1271b1af818e05607fb741e0
parent8679690f909767e118af4fc87a44b4c5e056b575
parent2f7177687ed9ea7c00ba072f99b555b4a88b0b24
Merge from trunk.